windowManager: Replace sessionMode.allowKeybindingsWhenModal

The original condition the property was based on was added to make
the a11y switcher available in the login screen, though it did never
work properly - after popping up the switcher, additional tab key
presses were ignored. As we are now able to filter bindings much more
selectively, we can simplify the check and drop the sessionMode property.

https://bugzilla.gnome.org/show_bug.cgi?id=688202

diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index feca51ee07107da2b13c58514e8dcb24435fe6ff..47b1bbffb83a829e6f6385271bfad1487750e26a 100644 (file)
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -14,7 +14,6 @@ const _modes = {
         showCalendarEvents: false,
         allowSettings: false,
         allowExtensions: false,
-        allowKeybindingsWhenModal: false,
         hasRunDialog: false,
         hasWorkspaces: false,
         hasWindows: false,
@@ -32,7 +31,6 @@ const _modes = {
     },
 
     'gdm': {
-        allowKeybindingsWhenModal: true,
         hasNotifications: true,
         isGreeter: true,
         isPrimary: true,

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 4e3467d5a0491ca6daee004909fd43e1ee4a528a..c4896eea8be36a4eb3f03c5a829214d4ae101f42 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -474,10 +474,8 @@ const WindowManager = new Lang.Class({
     },
 
     _filterKeybinding: function(shellwm, binding) {
-        if (!Main.sessionMode.allowKeybindingsWhenModal) {
-            if (Main.modalCount > (Main.overview.visible ? 1 : 0))
-                return true;
-        }
+        if (Main.keybindingMode == Main.KeybindingMode.NONE)
+            return true;
 
         // There's little sense in implementing a keybinding in mutter and
         // not having it work in NORMAL mode; handle this case generically